From b7567041df787e8b9d476833076c25cd9723f1d5 Mon Sep 17 00:00:00 2001 From: Robert Lipe Date: Wed, 16 Mar 2022 21:04:55 -0500 Subject: [PATCH] Take out ggv_bin, ggv_ovl, gnav_trl --- CMakeLists.txt | 1 - GPSBabel.pro | 1 - ggv_log.cc => deprecated/ggv_log.cc | 0 reference/format0.txt | 3 --- reference/format1.txt | 3 --- reference/format2.txt | 3 --- reference/format3.txt | 6 ------ reference/help.txt | 3 --- testo.d/ggv_log.test | 9 --------- vecs.cc | 23 ----------------------- xmldoc/formats/ggv_log.xml | 12 ------------ 11 files changed, 64 deletions(-) rename ggv_log.cc => deprecated/ggv_log.cc (100%) delete mode 100644 testo.d/ggv_log.test delete mode 100644 xmldoc/formats/ggv_log.xml diff --git a/CMakeLists.txt b/CMakeLists.txt index 97364fb4b..2ced30ede 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -99,7 +99,6 @@ set(ALL_FMTS ${MINIMAL_FMTS} gdb.cc geojson.cc ggv_bin.cc - ggv_log.cc ggv_ovl.cc globalsat_sport.cc googledir.cc diff --git a/GPSBabel.pro b/GPSBabel.pro index 5c9843cd0..ff32011c4 100644 --- a/GPSBabel.pro +++ b/GPSBabel.pro @@ -74,7 +74,6 @@ ALL_FMTS = $$MINIMAL_FMTS \ gdb.cc \ geojson.cc \ ggv_bin.cc \ - ggv_log.cc \ ggv_ovl.cc \ globalsat_sport.cc \ googledir.cc \ diff --git a/ggv_log.cc b/deprecated/ggv_log.cc similarity index 100% rename from ggv_log.cc rename to deprecated/ggv_log.cc diff --git a/reference/format0.txt b/reference/format0.txt index 185428c9e..c34427103 100644 --- a/reference/format0.txt +++ b/reference/format0.txt @@ -30,9 +30,6 @@ garmin_gpi gpi Garmin Points of Interest (.gpi) garmin Garmin serial/USB protocol gtrnctr tcx/crs/hst/xml Garmin Training Center (.tcx/.crs/.hst/.xml) geo loc Geocaching.com .loc -ggv_ovl ovl Geogrid-Viewer ascii overlay file (.ovl) -ggv_bin ovl Geogrid-Viewer binary overlay file (.ovl) -ggv_log log Geogrid-Viewer tracklogs (.log) geojson json GeoJson geonet txt GEOnet Names Server (GNS) dg-100 GlobalSat DG-100/BT-335 Download diff --git a/reference/format1.txt b/reference/format1.txt index d7245d336..9827f22fa 100644 --- a/reference/format1.txt +++ b/reference/format1.txt @@ -33,9 +33,6 @@ file garmin_gpi gpi Garmin Points of Interest (.gpi) serial garmin Garmin serial/USB protocol file gtrnctr tcx/crs/hst/xml Garmin Training Center (.tcx/.crs/.hst/.xml) file geo loc Geocaching.com .loc -file ggv_ovl ovl Geogrid-Viewer ascii overlay file (.ovl) -file ggv_bin ovl Geogrid-Viewer binary overlay file (.ovl) -file ggv_log log Geogrid-Viewer tracklogs (.log) file geojson json GeoJson file geonet txt GEOnet Names Server (GNS) internal dg-100-bin GlobalSat DG-100/BT-335 Binary File diff --git a/reference/format2.txt b/reference/format2.txt index 96eedebc5..ca952871b 100644 --- a/reference/format2.txt +++ b/reference/format2.txt @@ -33,9 +33,6 @@ file rw---- garmin_gpi gpi Garmin Points of Interest (.gpi) serial rwrwrw garmin Garmin serial/USB protocol file r-rw-- gtrnctr tcx/crs/hst/xml Garmin Training Center (.tcx/.crs/.hst/.xml) file rw---- geo loc Geocaching.com .loc -file rwrwrw ggv_ovl ovl Geogrid-Viewer ascii overlay file (.ovl) -file --r--- ggv_bin ovl Geogrid-Viewer binary overlay file (.ovl) -file --rw-- ggv_log log Geogrid-Viewer tracklogs (.log) file rwrwrw geojson json GeoJson file rw---- geonet txt GEOnet Names Server (GNS) internal r-r--- dg-100-bin GlobalSat DG-100/BT-335 Binary File diff --git a/reference/format3.txt b/reference/format3.txt index 0d5d28b55..00c83f56b 100644 --- a/reference/format3.txt +++ b/reference/format3.txt @@ -370,12 +370,6 @@ option geo deficon Default icon name string https://www.gpsbabel.org/WEB_DOC_ option geo nuke_placer Omit Placer name boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_geo.html#fmt_geo_o_nuke_placer -file rwrwrw ggv_ovl ovl Geogrid-Viewer ascii overlay file (.ovl) ggv_ovl - https://www.gpsbabel.org/WEB_DOC_DIR/fmt_ggv_ovl.html -file --r--- ggv_bin ovl Geogrid-Viewer binary overlay file (.ovl) ggv_bin - https://www.gpsbabel.org/WEB_DOC_DIR/fmt_ggv_bin.html -file --rw-- ggv_log log Geogrid-Viewer tracklogs (.log) ggv_log - https://www.gpsbabel.org/WEB_DOC_DIR/fmt_ggv_log.html file rwrwrw geojson json GeoJson geojson https://www.gpsbabel.org/WEB_DOC_DIR/fmt_geojson.html option geojson compact Compact Output. Default is off. boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_geojson.html#fmt_geojson_o_compact diff --git a/reference/help.txt b/reference/help.txt index 3f072052a..6d0c9e3b8 100644 --- a/reference/help.txt +++ b/reference/help.txt @@ -193,9 +193,6 @@ File Types (-i and -o options): geo Geocaching.com .loc deficon Default icon name nuke_placer (0/1) Omit Placer name - ggv_ovl Geogrid-Viewer ascii overlay file (.ovl) - ggv_bin Geogrid-Viewer binary overlay file (.ovl) - ggv_log Geogrid-Viewer tracklogs (.log) geojson GeoJson compact (0/1) Compact Output. Default is off. geonet GEOnet Names Server (GNS) diff --git a/testo.d/ggv_log.test b/testo.d/ggv_log.test deleted file mode 100644 index 65244be59..000000000 --- a/testo.d/ggv_log.test +++ /dev/null @@ -1,9 +0,0 @@ -# -# Geogrid Viewer tracklogs -# -rm -f ${TMPDIR}/ggv_log* -gpsbabel -i gdb -f ${REFERENCE}/gdb-sample.gdb -x track,pack -o ggv_log -F ${TMPDIR}/ggv_log-sample.log -bincompare ${REFERENCE}/track/ggv_log-sample.log ${TMPDIR}/ggv_log-sample.log -gpsbabel -i ggv_log -f ${REFERENCE}/track/ggv_log-sample.log -o ggv_log -F ${TMPDIR}/ggv_log-sample2.log -bincompare ${REFERENCE}/track/ggv_log-sample.log ${TMPDIR}/ggv_log-sample2.log - diff --git a/vecs.cc b/vecs.cc index a106b716f..00ecb372e 100644 --- a/vecs.cc +++ b/vecs.cc @@ -115,7 +115,6 @@ extern ff_vecs_t garmin_txt_vecs; #endif // CSVFMTS_ENABLED extern ff_vecs_t dmtlog_vecs; extern ff_vecs_t raymarine_vecs; -extern ff_vecs_t ggv_log_vecs; extern ff_vecs_t lmx_vecs; extern ff_vecs_t xol_vecs; extern ff_vecs_t navilink_vecs; @@ -202,7 +201,6 @@ struct Vecs::Impl GtrnctrFormat gtc_fmt; LegacyFormat dmtlog_fmt {dmtlog_vecs}; LegacyFormat raymarine_fmt {raymarine_vecs}; - LegacyFormat ggv_log_fmt {ggv_log_vecs}; GarminGPIFormat garmin_gpi_fmt; LegacyFormat lmx_fmt {lmx_vecs}; RandomFormat random_fmt; @@ -576,13 +574,6 @@ struct Vecs::Impl "rwf", nullptr, }, - { - &ggv_log_fmt, - "ggv_log", - "Geogrid-Viewer tracklogs (.log)", - "log", - nullptr, - }, { &garmin_gpi_fmt, "garmin_gpi", @@ -723,13 +714,6 @@ struct Vecs::Impl "bin", nullptr, }, - { - &ggv_ovl_fmt, - "ggv_ovl", - "Geogrid-Viewer ascii overlay file (.ovl)", - "ovl", - nullptr, - }, { &itracku_fmt, "itracku", @@ -877,13 +861,6 @@ struct Vecs::Impl "json", nullptr, }, - { - &ggv_bin_fmt, - "ggv_bin", - "Geogrid-Viewer binary overlay file (.ovl)", - "ovl", - nullptr, - }, { &globalsat_sport_fmt, "globalsat", diff --git a/xmldoc/formats/ggv_log.xml b/xmldoc/formats/ggv_log.xml deleted file mode 100644 index d5fcdf584..000000000 --- a/xmldoc/formats/ggv_log.xml +++ /dev/null @@ -1,12 +0,0 @@ - - Binary track logs used by the Geogrid-Viewer, a very - popular product in Germany. - - - GPSBabel has full support for version 1.0 of this file format. - - - We can also read some GPS data (including coordinates) from version 2.5. But - it seems, that this newer version no longer stores time stamps. This can be - a problem when converting to other formats or if you want to use our track filter. - -- 2.30.2